Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (14:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (14:19 -0700)
commit550c6a2507810730f9720c7a708c3dc47d109db1
tree0ebae198ae7d7f768393abb9f14e98a3697de2b0
parent6fd7e0517fc16d79f83e00339acebd7559d9a452
parented24abfbb437e0b6965b0e273c27f854a04a6afa
Merge from trunk.